From ce540e0464ed91a861254b3f44a9dd01705d56fe Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Tue, 13 Sep 2005 10:49:04 +0000
Subject: [PATCH] This trivial patch makes sure that mem-map.sxp and the qemu
 bits get installed in /usr/lib64 on distributions that want things there.

Signed-off-by: Rik van Riel <riel@redhat.com>
---
 .hgignore                                          | 10 +---------
 tools/examples/Makefile                            |  8 ++++++--
 tools/examples/{xmexample.vmx => xmexample.vmx.in} |  6 +++---
 tools/ioemu/target-i386-dm/Makefile                |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)
 rename tools/examples/{xmexample.vmx => xmexample.vmx.in} (95%)

diff --git a/.hgignore b/.hgignore
index 7bf6a0db87..7fe6aab273 100644
--- a/.hgignore
+++ b/.hgignore
@@ -60,8 +60,6 @@
 ^pristine-.*$
 ^ref-.*$
 ^tools/.*/build/lib.*/.*\.py$
-^tools/Makefile\.smh$
-^tools/balloon/balloon$
 ^tools/blktap/Makefile\.smh$
 ^tools/blktap/blkcow$
 ^tools/blktap/blkcowgnbd$
@@ -85,8 +83,7 @@
 ^tools/blktap/ublkback/ublkback$
 ^tools/blktap/xen/.*$
 ^tools/check/\..*$
-^tools/cmdline/.*$
-^tools/cmdline/xen/.*$
+^tools/examples/xmexample\.vmx$
 ^tools/console/xenconsoled$
 ^tools/console/xenconsole$
 ^tools/debugger/pdb/pdb$
@@ -109,8 +106,6 @@
 ^tools/firmware/vmxassist/roms\.h$
 ^tools/firmware/vmxassist/vmxassist$
 ^tools/firmware/vmxassist/vmxloader$
-^tools/gdb/gdb-6\.2\.1-linux-i386-xen/.*$
-^tools/gdb/gdb-6\.2\.1/.*$
 ^tools/ioemu/config-host\..*$
 ^tools/ioemu/keysym_adapter_sdl\.h$
 ^tools/ioemu/keysym_adapter_vnc\.h$
@@ -141,12 +136,9 @@
 ^tools/vnet/vnet-module/\..*\.cmd$
 ^tools/vnet/vnet-module/\.tmp_versions/.*$
 ^tools/vnet/vnet-module/vnet_module\.mod\..*$
-^tools/vnetd/vnetd$
 ^tools/vtpm/vtpm*
 ^tools/vtpm/tpm_emulator-*
 ^tools/vtpm_manager/manager/vtpm_managerd
-^tools/web-shutdown\.tap$
-^tools/x2d2/minixend$
 ^tools/xcutils/xc_restore$
 ^tools/xcutils/xc_save$
 ^tools/xenstat/xentop/xentop$
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 36edb8789f..5bfa67fd9f 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -25,7 +25,7 @@ XEN_SCRIPTS += block-phy
 XEN_SCRIPTS += block-file
 XEN_SCRIPTS += block-enbd
 
-XEN_BOOT_DIR = /usr/lib/xen/boot
+XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot
 XEN_BOOT = mem-map.sxp
 
 XEN_HOTPLUG_DIR = /etc/hotplug
@@ -37,12 +37,15 @@ build:
 install: all install-initd install-configs install-scripts install-boot \
 	 install-hotplug
 
+xmexample.vmx: xmexample.vmx.in
+	sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@
+
 install-initd:
 	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
 	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
 	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
 
-install-configs:
+install-configs: $(XEN_CONFIGS)
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
 		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
@@ -77,3 +80,4 @@ install-hotplug:
 	done
 
 clean:
+	$(RM) xmexample.vmx
diff --git a/tools/examples/xmexample.vmx b/tools/examples/xmexample.vmx.in
similarity index 95%
rename from tools/examples/xmexample.vmx
rename to tools/examples/xmexample.vmx.in
index 1c338beca4..c45a237033 100644
--- a/tools/examples/xmexample.vmx
+++ b/tools/examples/xmexample.vmx.in
@@ -8,7 +8,7 @@
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/vmxloader"
+kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader"
 
 # The domain build function. VMX domain uses 'vmx'.
 builder='vmx'
@@ -48,10 +48,10 @@ disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
 
 
 # New stuff
-device_model = '/usr/lib/xen/bin/qemu-dm'
+device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm'
 
 # Advanced users only. Don't touch if you don't know what you're doing
-memmap = '/usr/lib/xen/boot/mem-map.sxp'
+memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp'
 
 #-----------------------------------------------------------------------------
 # Disk image for 
diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 67dcb2e99e..856be8fe87 100644
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 include config.mak
 override TARGET_ARCH=i386
 
-INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
+INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
 DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
-- 
2.30.2